Minor updates

Just cleaning some things up.