Even more cleaning and documentation