Simplify display + add comments