Refactoring to clean up data; added new methods