Replace hardcoded values and remove comments