More improved formatting (stop now?)