Comment code and improve quality