Some cleanup and adding support for post thumbnail