Revert "more formatting. Convert remaining hardcoded values"

This reverts commit 4324f7c632628c3da53c9b52feb0864421aca420.