Clean up

Clean up whitespace and methods with missing "self" argument. Pages full of compiler warnings are gross. I'm not very well-versed in rust, but I did my best to choose between `self` and `&self`.