Cleaned up before submitting

Cleaned up the code before submitting