Removed blank line at the end of file and other minor cleanup