Fixup code

It Closes #87