Yeah you're right. There is a bit more refactoring that could easily be done. Will tackle it on Monday.