Fix formatting
Update todo file
Undo commented js code done while constructing