Cleanup. Main example shorter and cleaner