Code formatting & typo fixes