Formatting: Organize imports
Sort members
Code cleanup; Mostly removing trailing whitespace
Formatting!