cleaning up warnings
formatting