fixing comments
duplicate code