Clean up hard coding