- removed duplicate code