more formatting. Convert remaining hardcoded values

spacing, hardcoded values generalized