Minor indentation and comment changes