Some code cleanups, trivial stuff