reverted identation fixes, added TODOs