Clean up config alignment