Use less verbose code and update comments.