just some formatting, moving stuff around