formating cleaned up