Improve comments
Convert indentation to spaces and add some comments