no FSWalker anymore; code style fixes