Comments and clean up