Try to improve formatting