more regex consolidating
combined multiple replace statements just to make it cleaner