Clean up
Remove if __name__ ...
More efficient sampling from MVN