React refactoring and ready