Style fixes (unneeded newlines, comments, syntax)