Use strict and formatting fixes