cleaned up goToNext method, removed unnecessary code