Switched from tabs to spaces and added a few more comments