Removed dependence on jeweler; small cleanups of code