minor cleane up