Changes regarding comments of PR