Code smells removed