More minor changes / code cleanup