Fixed a couple of minor errors and removed more unnecessary code