more code-cleansing