Fixed according to @zero57's comments on github
modified for style