Formatting fixes / more comments