Finish refactoring and PrivatePub for create answer