fix spacing, add comments