CleanUp run, because readabillity. Also removed unused imports.