Code and comments changes