formatting & comment fixes