Code Formatting Changes

-Not tested-