Refactoring to Increase Code Climate Score

#40 #41 #43