Refactored to make App component