more formatting and clases and tests