Update
-minor code cleanup