Formatting code and fix code analysis