Cleaner input handling