Changing codestyle to more readable format that I use everywhere

Benchmarks were a bit hackish in programming style