Some small improvments
Changed module export to not export all methods automatically