Fixed Code imperfections