Work Done:
Code has been refactored and tidied up

Problems Faced:
None

Work to be done:
None