optimalize imports
clean up format