cleaned up helper views and added total waiting time