Minor code cleanup
Added TODOs to README