Removed some comments
Adjust colors