Attempt to improve formatting