Typo, cleanup and alignment changes