Clean up, lintify 100%