Run astyle
Remove redundant code
Merge branch 'master' into travis_kernel
try -j2, lets see how fast this is