Removed unneeded inner class for checking