Some refactoring along with loading speedup