minor fix - initializing var
making some returns cleaner