Bit of a tidy up. Added scaffold