Polished files some files

Brushed up the indentation and added better comments