refactoring
remove magic comment