Cleanup imports
Space
Remove boxing/unboxing in inner loop
Remove java6 support