Better formatting, better code