some cleanup in inputs