De-uglify things a bit