Fixed code style issues. Finished implementation of combinatorial explosion mitigation related to #12, for now.