Refactored and fixed typoes