Code clean up, lintify