code formatting, import cleanup