Small comment and code cleanup