getting rid of hardcoded values