Re-format classes