removed unncecessary inline declarations; refactored propositional-connective