Indentation and strict comparison fixes