minor refactoring to use proper importing style