Commenting and code style clean-ups