minor changes.. more cleaning up