cleaned up variable naming conventions