Comments and quality cleanup