Clean Up #2

More organizing.