fixed regex, removed comments