Shape up to make more presentable