Fixed some Code Style issues