Move comments around, rename xAlignment to xAlign, etc