Properly check for missing required info
Rename calendar block to prevent conflict with vendor calendar
Spaces to tabs
Removing trailing whitespace