second comit with tidy up