Changed variables to snake_case