fix: too many indent levels; add: some comment and blank lines