fix #76 & reduce dependance on Plantain. Clean code.