Cleaning code, changes in box sizes