Making everything a little saner