Framed out function calls.
Moved language enumeration.  Removed unnecessary read instances.