Fixed formatting; removed unused imports