fix indent and remove uneeded import references