STY: Rename variable so it is not redifined
STY/BUG: Remove unused imports

Fix #547