Remove and sort usings and fixing formatting