code cleanup, introduced exports