Cleaned up code
Added a sample test suite
Added a unit test for reading from data file