1. minor refactor