Clean up incoming keywords