Shortened according to code review