Modify code to better fit with style guide recommendations

This makes the changes to the code suggested by coffeelint.