non-functional changes (clean-up)