Using _ functions wherever applicable

Using _ functions and strict equal comparison operators