Remove debug print + cosmetics