fixed nullPointerException when retrun button pressed from the selection activity
comments have never caused any harm, also organize imports and code formatting