Huge format refactoring