Cleaned up code a little bit for demo