[Code] Cleaned up some variable declarations.