Clean up. More tests passing. Big ups to @jonallured