Add missing @Overrides
Format
Cleanup
Add TODOs and FIXMEs