Fixed tabs/spaces, updated comments