Cleaning up comments and changed demo window size