Some refactoring
Remove helper for shouldComponentUpdate