Fixed violations for home work