Cleanup & working example