minor refactor of properties and imports