Issue 1

This is the first iteration of the clean up of the code