fixed formatting, layout