Fixed Formatting classes