Backend tidy up, getting ready for next stage