Cleaning up require and use statements