Fixed Code Smells