Fixed more box lint errors, code clean up.