Clean public api