First try to get rid of clutter, #47