Clean up interface, add sample input