Cleanup

Modification to the code