Cleanup for presentation :)