cleanup: fix typo
cleanup: file iteration
cleanup: consistant handling of config load
cleanup: line length