Small cleanups, allow - in property names