:fire: change method names to snake_case, and refactor if/else