Some refactoring; still no conventions