cleaned up loading a bit