cleanup and clearer naming