tweaks and removing hard coding