Gh80 refactor constants

#56, #80