Change name, remove useless import
Clean up code