Organizing imports and code style