Refactorings.
Merged Celz' changes into mine.