Code Formatting

first full round of code formatting.