o Removed the commented benchmark module from the list of modules to
build (we now have to use -Pbenchmarks)
o Reformated some code