Removed unnecessary dependency.
Made the JST code clearer.