Added underscore for easier readability.
Separated imports of structs from traits.