no comments in code merged with master