Standard conform pass with cod sniffer and fixer
work in progress save