[171] refactoring update ;cleanup;