Better formatting of code