Modified code formatting and - where necessary - modified License headers appropriately