Refactored code based on Franco and Dan's comments

Line is too long. [117/80]