Cleaned Code, modified/deleted comments etc.
Cleaned Code up, no functional changes