better commenting and TestClass