removing hard coding