Refactor

- Remove wild card import #41