Shape up your code