Cleaning issues resolved

Changes made elsewhere so more pandonic