Fixed more formatting issues

Fixed more formatting issues