some additional tidy up