Improved discus-count code quality. Still bad though