small cleanup, more work on api