refactor, clean up, more succinct, better