Rework/cleanup expression builder
Validate action expressions
Make collections internal

To not expose implementation details
Cleanup code/comments