Simplify regex
Use each with object to simplify block