Mircea : cleaning up a bit