fix lint warning
Separated nested class into isolated file