Code comments updates + cleanup
Code comments updates + cleanup