Changed dump, removed TODO
Removed comments
Optimized imports