Changes in speedup, codestyle