MINOR Code cleanup and formatting