Cleaned up GPA handling