* Some more minor refactoring