Clean up some properties, docs to come