re-factored code to comply better with golint

renamed functions to avoid underscore
put doc string in form Name performs action
removed else claws when the if returns
Merge branch 'master' of github.com:AaronGoldman/ccfs