Improve less / take advantage of &