Dev experience optimization

shape