fixed code and unnecessary usings