Remove duplicate code
Better variable name
Fix: crash