clean up
comments
performance tests
clean up
comments
TODOs for future