Feedback

Updated code after some feedback