Improve formatting according to Stefans suggestion