Some minor code clean-ups of previous commits (need to get rid of local changes)