Fix import ordering

@swankjesse 

This cleans up the previous PR.