minor code cleanup
minor code cleanup
fix comments, PreCon
fix comments, PreCon, @Nullable
fix usage of PlayerHelper.getPlayerName for possible null return