Made LoadAll public and cleanup