Style: fix require and import statements