Initial tidy up
Initial tidy up