tidy all files and fix critic violations

tidy all files and fix critic violations #131