removed unecessary code
fixed issue with space in keywords [#1]