Some more sweet code reformatting.