added comments
remove unused property
added tests