Cosmetic changes - indenting and aligning