Changes in code and comments