Fix indentation, add some comments