Cleaned

Cleaned up and added gridsearch