Fix some spaces and regexp