minor refactor :rage1: