Change Return Value To Interface
Rerange Code