getting rid of hardcoded BS