Little maintenance fixes for clarity