Code clean up.
Code clean up for formatter.