Made time shorter and more consistent, bump pom
made regex more legible