Added small changes, implementing some feedback