Fixing indentation and commenting