deleted unnecessary code/comments