Update formatting, add some comments