Edits based of IDEA code inspection.