cleaning up code and making demo ready