Addressing @bartvde's review comments