cleaned up/commented some