Remove my warning and also prevent creation of additional variable. Moved @SuppressWarnings up to the method. Also do some tab->spaces cleanup