Remove unpythonic compose, fix underscorize regex