Clean up code and conventionize for CodeMaid