More Formatting

Adding comments and formatting