Cleaning up and refactoring smelly declarations