A little more refactoring for faster code
Some optimizations