REF: Tidied/commented code, apart from Scheduler Class