Renamed entry point to Expect & code clean