Code smells Fixed