more formatting, might be finished