cleaning code base and moving answers into questions