cleaned up spacing, added some headers+comments