Clean up

Christmas is coming and we have not forgotten about it! It is time to
transform this repo into a good guy :+1: