Fixed code violations