refactor FIXMEs and TODOs