remove warnings
reformat