Refactor and view updates