Simplify things by moving formatting to CSS