Converted spaces to tabs for consistency
Added some comments