Addresses Some Code Smells