Code formatting, minor edits