Refactoring to make bin/jlf cleaner and shorter.  Removed lots of hard coding.  Now need to standardise interfaces to methods