Improved some regex