minor refactor to boilerplate structure