Added console key, cleanup