Slight refactoring to bring table loads all to front