Style fixes (make sure each statement is on its own line)