Ammended the comments from Daniel's Code-Review