Get rid of magic numbers
Store code review comments for later use