Simplification, refactoring, name changes