organized commits, expanded regex