Improve styling and clarity