Making changes, removing hard coding