add roster managing tool and code clean up