Formatting proposals

BTW: Nice solution.