Code refactoring
post commenting