Commit: extract methods