Refactored Nil and Hash - moved to 'format' directory