removed unneeded lines in code, classes are still seperated and organized