Little bit of tidy up and refactor.