Reworked problem format for consistency