Applied changes relating to the comments from Marcus.