cleaned up some variable declarations