- Added ability to read function files
- Minor cleanup
- Refactored internal class so that it can be used by
subclasses in the future.

Change-Id: I2eaa819ccace77d30379bc90f5f9956bcd1d58a7