refactor code

delete some comments, extra whitespaces etc