Code cleanup; address issue with loading from wrong user dir