Code cleanup/reformatting
Code cleanup/reformatting