Refactor code for sanity and so the view changes handler can reuse code better