couple of basic inputs refactored