Simplify code
Do not use UPPERCASE for constants

Case matters (at least in Go)
Change some names and add a comment