Added support for post formats & general cleanup