Whitespace cleanup and remove unused variable