Improve aesthetics