Fix indents an spacing, add comments to code