I merged up the spotless PR if you choose to want it.
I did notice you have a strange mix of tabs and spaces in random location in the code.
This also will automatically fix it so everything is indented with 4 spaces.
I know you said you were skeptical about it.