cleaning up project imports, variables names

fixed conflicting variables names
removed unused imports
removed some weird edu.berkeley.cs160 imports