Minor suggested edits (indents, logging)