small changes
removed unnecessary declarations