GENERAL: small code clean-up