Clean up spacing, add comments