Make more simple(r)