Major restructuring and commenting