Reformatting, removing unused imports