Changed some constant naming and arrangement.
Remove some comments