Refactor/snake case