Changed comments and local vars