#4

Cleaning up whole mess