More small changes

Mostly cleaning up some little things here and there