cleaned up a bunch of commented code and inspects