Condensed to better regex experession