removed unused usings and fixed formatting