small fix and cleanup