CoffeeLint: New feature added (#655)

Also organized and reformatted code.