Fixed mispresented loading time
Finished refactoring for #29