Cleaned up formatting of shifts