Fixed code violations and minor formatting issues
Fixed code violations and minor formatting issues