fixed #4
tidy up