removed whitespaces, comments and aliens. moved options hash into specific matcher value