code format and fixing typo
simple change, mostly are removing those unnesserary unboxing code.