Deleted old functions, added string(s), removed more redundant code (i.e unused import statements)