Code reformatting and removal of unneeded imports.