cleaned up a couple lines of code