Cleaned up create and view Events