Got rid of some hard coding