Clean up: code replication