Formatting cleanup, remove empty lines