removed comments and changed signatures