Cleanup, exponents still not working properly