simplifying imports, neatening up code, altering comments