Removed unneeded inner enum and made other inner class static.