Removed todo about split by space