Cosmetic issues, light refactoring, update TODOs