Updated VBE, cleaned up