Refactor: constants, code cleaning