removed some TODOs
fixed some convention violations
fixed some convention violations2