c8817d: code clean up