Simplify loading logic further