Use enum class instead of enum, and autoformat the code

Use enum class instead of enum, and autoformat the code #1480