General cleanup

Simplify some overly-verbose code