Removed unused statements and whitespaces