Finished status affect refactoring