post/Persistence - Code improvements