Some minor comment updates and code cleaning