finished cleaning up variable names (removed underscores)