Minor cleanup

Non-functional changes
Syncing Up