Clean-up and first attempt of documentation