Make regex cleaner?