Slightly better formatting, fixed regex-comments.