debugging, stylistic changes