Added data functions and cleaned up variable naming conventions