Fixing indentation in the output; better comments