More input cleanup