refactoring end of softdev class