Clean up.

- Fix whitspaces mistakes
- put Strings in static finals
Add constructors that allow sets of requirements.
Cleanup.

Don't checkt `indexOf (...) > -1` check `contains (...)`.