Updated all files with proper indenting and some additional comments