Made variable declarations and naming consistent.