Renamed variable for clarity
Removed unused method, tweaked select axis, and prevent possible NPE