optimized schedule list and cleaned newly added code