Fixed typo and refactored
Refactored looks