small refactoring to excluded suffixes
a few renamings & restructurings to clarify code