Code Formatting

Very extensive!!