Interface cleaned up for prototype