refactoring and postmethod fix