Improve performance, clarity