Added 30 minute buffer to start/end times
Beautified