A little codecleanup...