interest class and unit test
minor clean ups for readability