tidy up the code a little bit
merging