Flesh out the idea, leaner, cleaner code