proposing a little api cleanup