Opts for portions of the code

[mdaiter]

Hey @PascalPons , Just had a few optimizations I'd like to commit. Most of these are minor that just caught my eye. Thanks so much