cleanup
move exports up