Clean-up: removed duplicate code