Minor codes clean up