- small cleanup and dependency fix