Internal improvements

The code has been optimized which in turn should cause a small performance boost.