Organizing imports and minor changes