cleaned up variable declarations