Refactored: removed all unneccessary imports; reduces compile time