Refactoring, comments, image size, box schema