After review.
Got rid of useless nested class.
~After review.
~After review.
~Got rid of useless nested class.
~After review.