React refactor

some general clean up and standardizing