Cleaned up formatting and imports