Reformatting code, remove unused using statements