- refactoring post-1 code