linting, consolidation, small fixes