code clean up, alle export working