clean up
comments
TODOs for future