Seperated some code into scruffy