Slightly cleaner committing