Updating state correctly when props change
Cleanup
Updating build