various cosmetic refactoring