More code fussiness