add unit tests;
remove unused comments;