Cleaned up some regex