Improved formatting of assignments