Add faker reference and remove trailing ws/empty lines