Cleaning up TODOs
Spacing
Formatting
Spacing
Spacing
Formatting
Formatting
Formatting
Spacing
Formatting
Spacing
Formatting