Code refactor
Refactor post