Fixed how directions were being loaded and cleaned up code