Cleaned up for submission demo