Cleaned up automatically-generated code