added formating improvements
fixed merge issues//added format