fix: clean code
tweak: move loading