Tweaks and cleanup
Polished property operations