removed support of symbolic requirements
several stylistical changes