Small cleanups... I was bored