Use strict, other small changes