Handeled the comments empty or spaces issue #197