comment updates and light code cleanup