Cosmetics + fixing a bug
-