status refactoring