Updated global constants other cleaning