Cleaned imports and reformatted code