Mr Proper

Code cleanup iteration 1