Refactoring and TODOs.