Minor code refactoring
Split expression before evaluation

Fixed bug with invalid expression splitting