Clean up source + Improve example