Formatting cleanup

Remove empty lines and trailing whitespaces