Applied fixes proposed on code review