cleaned up xinits