Refactor

Hey what do we think here Bob?