Changes after comments from @peterbe