Cleaned up Points System