Some readjustments to the sourcecode