More proper (20/48)

More proper