PEP8 cleanup, remove unnecessary inner class