Constants bruting update
Trim code, fix bug