Minor code cleanups

similar to previous commit. Committing for consistency