FIX: come code improvements