Fixed violations of code-styling guides