Reverting formatting and import organized