Little Update

Clean the Code and fix some unused imports.