Update changes
Minor change
Little clean-ups