Fix `this` misusage and indentation