Upgraded comments

With help from @TotempaaltJ