Minor cleanup

Thrashed around and did very little worth committing.