Commenting and style consistence updates