app4 tidy up