minor refactor and clean