Fixed some code violations