Adding test
Source code clean up