Refactored based on Dan and Zyed's comments

Line is too long. [81/80]