Doing a bit of refactoring/removing