code tidying, no functional changes