added strict and fixed formatting