Improved code quality in UserProgress