removed unnecessary blocks/comments, white spaces, dubugging notices