Minor cleanup

More concise code
Revert "Minor cleanup"

This reverts commit d0add1307b27326682cb1b79bfabc0f16fcfde18.
Revert "Revert "Minor cleanup""

This reverts commit 9af5e9d75e08c765bc732bc087d9d0f8ef179191.
Minor cleanup