Clean up Factorial & Exponent

Variable renaming nonsense & minor refactoring