fixed bug and slight tidy up