revises all files to streamlined approach