stylistic changes and initialization of variables