Refactored some code
Extraneous workspace changes