santized things a bit