Remove redundant constant, fix code style