clean and hopefully full commit