code review and project cleanup

Nice implementation. I can see you watched Uncle Bob  :+1: 
I hope you tried your own solution before :)