First Commit Post Refactoring