basic stuff all working
Code tidy