[console] code clean-up