Minor changes, unused variables has been deleted