removed a couple lines of useless code, changed method calls per hw