Minor changes

Remove TODO (always assume valid inputs)