Cleaned up implementation

Also fixed bug where unexpected result appeared when having a model with
unSAT errors that contained comments.