formatting and fixing imports