Fixed formatting

And added comments