Tiny comments and code improvements