cleaned up code
Cleaned up the comments