Clean up code, snake_case for ids