Break up valid? methods, edit url regex