Cleanup, and I think possibly minor speedboosts!