Put ref to the methods and removed unused usings