More .size refactoring