Fixing some Code style formatting issues