Properly adhere to module pattern