refactor for psr-0 standard and fixes for SHM controller update