reorg'd some simple stuff