slimming down and changing indentation