Cleaning code for codestyle and using new varargs constructor from RdfStream