Boxing bug fix + clean