General code cleanup (make Flake8 happy)