refactoring
indicator
remove magic number