post/persistence - Code improvements