ROSified, cleaned up