Fixing import messiness and other review notes