Cleanup and improve comments