Cleanup
Cleanup
Cleanup
Cleanup
Better readable names
Move namespace