Arrange exporting methods better