Added interactive console
Clean up