Whitespace fixes and shorter regexp