Cleaned the code and removed some unnecessary files