fix warnings, clearer naming