Remove unnecessary return statements
Change to snake_case