Code cleanup: Importing modules