Fixing TODOs, cleanup, refactor