Refactoring -> remove all extra lines in 'var' declarations