Some minor refactoring, updated TODOs