Remove and added comments, more refactoring