- refactoring post-2 code