Little extra cleanup for readability