Refactoring

No due date 37% complete

Refactoring and code clean up tasks raised at some point in development or review.