post/persistence - Code Improvements