Implement OnSaveInstanceState, Refactor