add console integration
code cleanup