Shifts Link to PS standards
Adopts single if-else to good practices