Little code cleanups. Start to add interactive shell