refactor, add some constants