Minor changes on comments and descriptions