added some indentation and sets