Feature tidy up

Yeah, so lets try this then