removed duplicate code lines