Add Refactoring toward better code post