Better solution
Cleanup
Better drawing