Resolving PSR1/2 Violations

No functional changes here or bug fixes, mostly just spacing changes that were picked up when I reformatted the SDK w/ IntelliJ