Resolves minor issues reported during quality check (#2).
Resolves info issues during quality check (#2).