formatting and remove unneeded import