Console window code cleanup
Console work