Added legacy default location and cleaned up formatting