Shobiz: Cleaning up code for schedule