refactoring and cleanup
refactoring and cleanup
tests and removed possible problem with spaces in lists