Indentation
Remove unused defs
Clean up