Minor style related cleanup

Also added some todo's indicating supoptimal coding practices.