Modify indentation and whitespace
Remove unused 'subset' statement